| @@ -36,12 +36,15 @@ class TenancyShotInfo(BaseModelMixin): | ||
| 36 | 36 |  | 
| 37 | 37 | @property | 
| 38 | 38 | def data(self): | 
| 39 | + try: | |
| 40 | + model = ModelInfo.objects.get(model_id=self.model_id, status=True) | |
| 41 | + except: | |
| 42 | + model = None | |
| 39 | 43 |          return { | 
| 40 | 44 | 'shot_id': self.shot_id, | 
| 41 | 45 | 'model_id': self.model_id, | 
| 42 | - 'model_name': self.model_name, | |
| 46 | +            'model_info': model.admindata if model else {}, | |
| 43 | 47 | 'sn': self.sn, | 
| 44 | - # 'fittings_type': self.fittings_type, | |
| 45 | 48 | 'front_cap_status': self.front_cap_status, | 
| 46 | 49 | 'rear_cap_status': self.rear_cap_status, | 
| 47 | 50 | 'lens_hood_status': self.lens_hood_status, |